From: Jonas Dreßler <verdre@v0yd.nl>
Date: Sun, 17 Nov 2019 15:24:52 +0000 (+0100)
Subject: mpris: Use a scope specific message instead of a global one
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~781^2^2~392
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=d5e8f8cdf7aa3cf6525d58ecfbba05832df3d8a6;p=gnome-shell.git

mpris: Use a scope specific message instead of a global one

Since the mpris implementation of the notification tray supports showing
multiple notification (one for each player), it doesn't make sense to
have only one global property to store the message, since that only
allows referencing one message at a time.

Instead, handle the MediaMessages completely inside the scope of
`_addPlayer()`, this should allow showing more than one message again,
which broke with commit 4dc44304dff2974d3b026b5aa58e0d5c25d38216 [1].

[1] https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/791

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/833
---

diff --git a/js/ui/mpris.js b/js/ui/mpris.js
index 5a936b5af..a16e56b5d 100644
--- a/js/ui/mpris.js
+++ b/js/ui/mpris.js
@@ -256,18 +256,20 @@ class MediaSection extends MessageList.MessageListSection {
             return;
 
         let player = new MprisPlayer(busName);
+        let message = null;
         player.connect('closed',
             () => {
                 this._players.delete(busName);
             });
         player.connect('show', () => {
-            this._message = new MediaMessage(player);
-            this.addMessage(this._message, true);
+            message = new MediaMessage(player);
+            this.addMessage(message, true);
         });
         player.connect('hide', () => {
-            this.removeMessage(this._message, true);
-            this._message = null;
+            this.removeMessage(message, true);
+            message = null;
         });
+
         this._players.set(busName, player);
     }
 
@@ -288,10 +290,7 @@ class MediaSection extends MessageList.MessageListSection {
         if (!name.startsWith(MPRIS_PLAYER_PREFIX))
             return;
 
-        if (newOwner && !oldOwner) {
-            if (this._message)
-                this.removeMessage(this._message);
+        if (newOwner && !oldOwner)
             this._addPlayer(name);
-        }
     }
 });